[pull] main from django:main#112
Merged
pull[bot] merged 2 commits intothreatcode:mainfrom Sep 25, 2025
Merged
Conversation
I added this back in 3222fc7 to try and avoid merge conflicts from concurrent edits to release notes in different branches. However, in my recent experience, it has caused more problems than it solves. I have found that when rebasing a branch that modifies a release note, it can merge sections without an intermediate blank line, leading to broken reST syntax. Example spotted in code review: #17554 (comment) . I think it’s better we remove this configuration and deal with merge conflicts deliberately.
Signed-off-by: SaJH <wogur981208@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )